Fix the single file merge command #26
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
It hadn't ever been used, and didn't work
thefloweringash
approved these changes
Apr 30, 2025
| @@ -239,15 +239,14 @@ class PhraseAppUpdaterCLI < Thor | |||
| validate_readable_file!('ancestor', ancestor) | |||
| validate_readable_file!('ours', ours) | |||
| validate_readable_file!('theirs', theirs) | |||
| validate_writable_file!('to', to) | |||
There was a problem hiding this comment.
The merge function uses
result_path = options[:to]
validate_writable_path!('to', result_path)It seems nice to be be consistent, and also preserve the writable file check.
There was a problem hiding this comment.
validate_writable_path! is perhaps misnamed, because it validates that it's an existing writable directory, which isn't helpful here. validate_writable_file! wouldn't be desirable either, because it likewise validates that it's an existing writable file.
What we'd ideally want here is validation that it's a path that could be written to (i.e. either a writable file or no existing file in a writable directory), which is something we haven't added to our library of helper function yet.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
It hadn't ever been used, and didn't work